linux/x86: avoid a re-definition warning on x86-64 and change i386

similarly to be consistent.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S b/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S
index 45b6867b68f9b4ae2df7d25afd85dc71e7950e58..3d6d430ed8bdb4b23a9a5e9d29759938369c73f0 100644 (file)
--- a/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S
@@ -12,8 +12,6 @@
 #include <xen/interface/xen.h>
 #include <xen/interface/elfnote.h>
 
-#define _PAGE_PRESENT 0x1
-
 /*
  * References to members of the new_cpu_data structure.
  */

diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S b/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S
index 3619988fa49e9d30a040532309e1360a3f00b76c..424c1903c943eb490f1d1fa1559051089a25b20d 100644 (file)
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S
@@ -25,8 +25,6 @@
 
 #include <xen/interface/elfnote.h>
 
-#define _PAGE_PRESENT 0x1
-
        .section .bootstrap.text, "ax", @progbits
        .code64
 #define VIRT_ENTRY_OFFSET 0x0

diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h
index 31ce73e2665945e5302818e4d069c52a269d296c..40d870c3f02d2211d9f9403a017b7f53ee04bdf6 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h
@@ -20,6 +20,14 @@
 #define LARGE_PAGE_SIZE (1UL << PMD_SHIFT)
 
 #ifdef __KERNEL__
+
+/*
+ * Need to repeat this here in order to not include pgtable.h (which in turn
+ * depends on definitions made here), but to be able to use the symbolic
+ * below. The preprocessor will warn if the two definitions aren't identical.
+ */
+#define _PAGE_PRESENT  0x001
+
 #ifndef __ASSEMBLY__
 
 #include <linux/string.h>
@@ -29,13 +37,6 @@
 #include <xen/interface/xen.h>
 #include <xen/features.h>
 
-/*
- * Need to repeat this here in order to not include pgtable.h (which in turn
- * depends on definitions made here), but to be able to use the symbolic
- * below. The preprocessor will warn if the two definitions aren't identical.
- */
-#define _PAGE_PRESENT  0x001
-
 #define arch_free_page(_page,_order)           \
 ({     int foreign = PageForeign(_page);       \
        if (foreign)                            \